From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Wed, 3 Oct 2018 09:21:45 +0000 (+0200)
Subject: resolve double typedef
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~44
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=41ab1083f516a0c4259e9eee795fa6d0cc2ebd00;p=siridb-server.git

resolve double typedef
---

diff --git a/include/siri/net/promise.h b/include/siri/net/promise.h
index 001bb59e..79049c83 100644
--- a/include/siri/net/promise.h
+++ b/include/siri/net/promise.h
@@ -25,11 +25,9 @@ typedef enum
 } sirinet_promise_status_t;
 
 typedef struct sirinet_promise_s sirinet_promise_t;
-
-typedef struct sirinet_pkg_s sirinet_pkg_t;
 typedef void (* sirinet_promise_cb)(
         sirinet_promise_t * promise,
-        sirinet_pkg_t * pkg,
+        void * data,
         int status);
 
 #include <uv.h>
diff --git a/src/siri/db/forward.c b/src/siri/db/forward.c
index 1b4069f9..ca719203 100644
--- a/src/siri/db/forward.c
+++ b/src/siri/db/forward.c
@@ -145,7 +145,7 @@ void siridb_forward_points_to_pools(uv_async_t * handle)
                 forward->siridb->pools->pool + n,
                 pkg,
                 0,
-                sirinet_promises_on_response,
+                (sirinet_promise_cb) sirinet_promises_on_response,
                 promises,
                 0))
         {
diff --git a/src/siri/db/initsync.c b/src/siri/db/initsync.c
index 91a92362..6a1f94f8 100644
--- a/src/siri/db/initsync.c
+++ b/src/siri/db/initsync.c
@@ -333,7 +333,7 @@ static void INITSYNC_send(uv_timer_t * timer)
                     siridb->replica,
                     siridb->replicate->initsync->pkg,
                     INITSYNC_TIMEOUT,
-                    INITSYNC_on_insert_response,
+                    (sirinet_promise_cb) INITSYNC_on_insert_response,
                     siridb,
                     FLAG_KEEP_PKG);
         }
diff --git a/src/siri/db/insert.c b/src/siri/db/insert.c
index 34c9698b..b8ef59e7 100644
--- a/src/siri/db/insert.c
+++ b/src/siri/db/insert.c
@@ -1174,7 +1174,7 @@ static void INSERT_points_to_pools(uv_async_t * handle)
                     siridb->pools->pool + n,
                     pkg,
                     INSERT_TIMEOUT,
-                    sirinet_promises_on_response,
+                    (sirinet_promise_cb) sirinet_promises_on_response,
                     promises,
                     0))
             {
diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c
index 3bcd0954..4e35ad63 100644
--- a/src/siri/db/listener.c
+++ b/src/siri/db/listener.c
@@ -3633,7 +3633,7 @@ static void exit_set_backup_mode(uv_async_t * handle)
                         server,
                         pkg,
                         0,
-                        on_ack_response,
+                        (sirinet_promise_cb) on_ack_response,
                         handle,
                         0))
                 {
@@ -3910,7 +3910,7 @@ static void exit_set_log_level(uv_async_t * handle)
                             server,
                             pkg,
                             0,
-                            on_ack_response,
+                            (sirinet_promise_cb) on_ack_response,
                             handle,
                             0))
                     {
diff --git a/src/siri/db/pools.c b/src/siri/db/pools.c
index bfc82d8e..722b9f2c 100644
--- a/src/siri/db/pools.c
+++ b/src/siri/db/pools.c
@@ -241,7 +241,7 @@ void siridb_pools_send_pkg(
                     pool,
                     pkg,
                     timeout,
-                    sirinet_promises_on_response,
+                    (sirinet_promise_cb) sirinet_promises_on_response,
                     promises,
                     FLAG_KEEP_PKG | flags))
             {
@@ -300,7 +300,7 @@ void siridb_pools_send_pkg_2some(
                     pool,
                     pkg,
                     timeout,
-                    sirinet_promises_on_response,
+                    (sirinet_promise_cb) sirinet_promises_on_response,
                     promises,
                     FLAG_KEEP_PKG | flags))
             {
diff --git a/src/siri/db/reindex.c b/src/siri/db/reindex.c
index 52e77830..7f74e3a7 100644
--- a/src/siri/db/reindex.c
+++ b/src/siri/db/reindex.c
@@ -350,7 +350,7 @@ static void REINDEX_send(uv_timer_t * timer)
                 siridb->reindex->server,
                 siridb->reindex->pkg,
                 REINDEX_TIMEOUT,
-                REINDEX_on_insert_response,
+                (sirinet_promise_cb) REINDEX_on_insert_response,
                 siridb,
                 FLAG_KEEP_PKG);
     }
diff --git a/src/siri/db/replicate.c b/src/siri/db/replicate.c
index 7a0bfb45..9f0cda26 100644
--- a/src/siri/db/replicate.c
+++ b/src/siri/db/replicate.c
@@ -233,7 +233,7 @@ static void REPLICATE_work(uv_timer_t * handle)
                 siridb->replica,
                 pkg,
                 REPLICATE_TIMEOUT,
-                REPLICATE_on_repl_response,
+                (sirinet_promise_cb) REPLICATE_on_repl_response,
                 siridb,
                 0))
         {
@@ -250,7 +250,7 @@ static void REPLICATE_work(uv_timer_t * handle)
                     siridb->replica,
                     pkg,
                     0,
-                    REPLICATE_on_repl_finished_response,
+                    (sirinet_promise_cb) REPLICATE_on_repl_finished_response,
                     NULL,
                     0))
             {
diff --git a/src/siri/db/server.c b/src/siri/db/server.c
index 3bd51134..6b994e4d 100644
--- a/src/siri/db/server.c
+++ b/src/siri/db/server.c
@@ -328,7 +328,7 @@ void siridb_server_send_flags(siridb_server_t * server)
             server,
             pkg,
             SIRIDB_SERVER_FLAGS_TIMEOUT,
-            SERVER_on_flags_update_response,
+            (sirinet_promise_cb) SERVER_on_flags_update_response,
             NULL,
             0))
     {
@@ -727,7 +727,7 @@ static void SERVER_on_connect(uv_connect_t * req, int status)
                         server,
                         pkg,
                         0,
-                        SERVER_on_auth_response,
+                        (sirinet_promise_cb) SERVER_on_auth_response,
                         NULL,
                         0))
                 {
diff --git a/src/siri/db/servers.c b/src/siri/db/servers.c
index d95dd68c..2342e571 100644
--- a/src/siri/db/servers.c
+++ b/src/siri/db/servers.c
@@ -394,7 +394,7 @@ void siridb_servers_send_pkg(
                         server,
                         pkg,
                         timeout,
-                        sirinet_promises_on_response,
+                        (sirinet_promise_cb) sirinet_promises_on_response,
                         promises,
                         FLAG_KEEP_PKG))
                 {